* frame.c (x_get_resource_string) [!USE_GTK]: Don't define.

diff --git a/src/ChangeLog b/src/ChangeLog
index 0c32b74fdba994e7221d87fead101a908d3ffed9..c8189ffc0e71c166ca007d95898c4b69dd180203 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,7 @@
 2015-03-13  Paul Eggert  <eggert@cs.ucla.edu>
 
+       * frame.c (x_get_resource_string) [!USE_GTK]: Don't define.
+
        * editfns.c, systime.h (mktime_z) [!HAVE_TZALLOC]: Now static.
 
 2015-03-12  Eli Zaretskii  <eliz@gnu.org>

diff --git a/src/frame.c b/src/frame.c
index aa07219d152d90cb21f8f2686afaad495c5d399e..22086552ea3aaee329e05675ec8f2369ef0065fe 100644 (file)
--- a/src/frame.c
+++ b/src/frame.c
@@ -4188,7 +4188,7 @@ display_x_get_resource (Display_Info *dpyinfo, Lisp_Object attribute,
                            attribute, class, component, subclass);
 }
 
-#if defined HAVE_X_WINDOWS && !defined USE_X_TOOLKIT
+#if defined HAVE_X_WINDOWS && !defined USE_X_TOOLKIT && !defined USE_GTK
 /* Used when C code wants a resource value.  */
 /* Called from oldXMenu/Create.c.  */
 char *